Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sat, 13 Feb 2010 12:30:17 +0000 (13:30 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sat, 13 Feb 2010 12:30:17 +0000 (13:30 +0100)
commit5ef2e7963e4e411b7a58db52dc38c2ba9a9e4d3d
tree92038b34a5c292306c92701b54633e4faa074b7f
parent2c3be59338be80b0b502c6f9e26a7ae6cb8c82b8
parenta32f4801cf25a0927f7a1d691dfbc7315ff7ef5b
Merge from trunk